bitkeeper revision 1.1033.2.1 (40e2984e2zvy_SmswhqVEUmHVvOK-Q)

Build fixes

diff --git a/linux-2.4.26-xen-sparse/arch/xen/config.in b/linux-2.4.26-xen-sparse/arch/xen/config.in
index cd1a2278aa45a94951e0df00c4bcf3538f558d34..b77b979c115ba6caff8032c372cb9b482ba72c21 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/config.in
+++ b/linux-2.4.26-xen-sparse/arch/xen/config.in
@@ -21,6 +21,7 @@ endmenu
 define_bool CONFIG_NO_IDLE_HZ y
 
 if [ "$CONFIG_XEN_PHYSDEV_ACCESS" != "y" ]; then
+   define_bool CONFIG_NETDEVICES y
    define_bool CONFIG_VT n
 fi
 
@@ -173,17 +174,19 @@ if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
       define_bool CONFIG_BLK_DEV_HD n
    fi
    endmenu
+fi
 
-   mainmenu_option next_comment
-   comment 'SCSI support'
+mainmenu_option next_comment
+comment 'SCSI support'
 
-   tristate 'SCSI support' CONFIG_SCSI
+tristate 'SCSI support' CONFIG_SCSI
 
-   if [ "$CONFIG_SCSI" != "n" ]; then
-      source drivers/scsi/Config.in
-   fi
-   endmenu
+if [ "$CONFIG_SCSI" != "n" ]; then
+   source drivers/scsi/Config.in
+fi
+endmenu
 
+if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
    source drivers/message/fusion/Config.in
 
    source drivers/ieee1394/Config.in
@@ -234,18 +237,6 @@ if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
    #
    source drivers/input/Config.in
 else
-   define_bool CONFIG_NETDEVICES y
-
-   mainmenu_option next_comment
-   comment 'SCSI support'
-
-   tristate 'SCSI support' CONFIG_SCSI
-
-   if [ "$CONFIG_SCSI" != "n" ]; then
-      source drivers/scsi/Config.in
-   fi
-   endmenu
-
    #
    # Block device driver configuration
    #

diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
index 7f3b2f632533cdc28fcf48238ca912a350264494..5a1d4803e39841fb2097c2bd32729f2072f114c6 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
+++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
@@ -13,6 +13,8 @@ CONFIG_UID16=y
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 # CONFIG_XEN_PHYSDEV_ACCESS is not set
 CONFIG_NO_IDLE_HZ=y
+CONFIG_NETDEVICES=y
+# CONFIG_VT is not set
 
 #
 # Code maturity level options
@@ -179,7 +181,6 @@ CONFIG_IP_NF_TARGET_ULOG=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-CONFIG_NETDEVICES=y
 
 #
 # SCSI support
@@ -519,8 +520,6 @@ CONFIG_NLS_ISO8859_1=y
 # Console drivers
 #
 CONFIG_XEN_CONSOLE=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
 
 #
 # Kernel hacking